clean up naming in build system