Removed double function naming