Variable naming changes