Partially cleaning up names