Adjusts naming