Reverted back package naming