Rename folder to follow the existing naming convention