Fix of namespace includes, and method names.