Fixed package naming within trait and service