fixed some namespace errors in the newest version.