templates renaming, preparation for tests