More naming and snapshot/differential cleanup