Properly implement trim names (I think