Make controller spec tests pass. rename files throughout the Angular application for consistency.