Updated for Summer 13 and non-namespaced org

Updated for Summer 13 and non-namespaced org