Namespace change, fixes in translated Rasmus code