small bug with templates
renaming some objects