Cleaned up the part names