Tiny renaming
Fix tests