Fixed namespace issue that caused failure on build server