Changed services to follow file naming convention