Fixed the name space issues with scripting.