Updated some namespaces
Also updated CLI script for sample data generation