Change names, fix some cases for font adjustment