Fixed package naming, etc.