more clean up and normalization of naming