[dev] Working on renaming issues: making tests pass and fixing examples.