Files renaming for consistency