fixing the damn naming bug...