Fix name to match old refactoring
Remove now fixed FIXME