rethinking one of the naming conventions