add templates; fix some naming to be consistent