Constants naming fix