Added .magma suffix to remaining scopes