clarify revised naming scheme, clean up engine references