Fixing the bug in the naming