Refactor and name fix.