Fixed the naming issues