Remove .constructor from scope name logic