sure. if you could re-check where each is used and document in the
templates a little bit, that would be great. otherwise the rename itself
is surely good.