Naming updates, live database update

Naming updates, live database update