refactofing: renaming + one more test