Removing dependencies on Jeff's naming scheme
Removing dependencies on Jeff's naming scheme