name changes
more name changes, looks fairly good now