Refs #11 more renaming (instances)