Fixed recent namespace changes