Fixed package naming conventions