clear the naming conventions a little bit