make names codable
more consistent naming