clean up naming convention