clean up naming conventions