Rename to proper format