Cleaned up part names