namespace changes
various changes