Fix changest and namespace formatting