Further refactoring to naming of template elements. Plugin builder works now and so does default make target.