renamed base template and fix references