Put these all back up outside of the nimsdata namespace.