Renamed templates. UITest 8 temporarily failing.