Rename folder to stay consistent with naming style