Major updates and clean up

A new naming system