EAGLESIX-2687 Renamed files per convention(for templates)