Maven convention + last fix