Change name to proper