Fixed constans to be static and have their names in capitals