clean up, consistent naming