Updating some of the template names to fix search/replace issues when using as a base for a derived module.