Renamed models Types to Type and Songs to Song