Changed the names to correct and understandable names