Hopefully stabilized the naming convention