Simple name space / typo fixes