more namespace changes, makes more sense now