Fixed all (?) refactoring mistakes where Face was renamed to Cell