Minor renaming
Migrated some additional things to the new methods