rename a few things
start removing uneeded templates