E1S8.1: fixed stub map placeholder inclusion that was using the old E1S7 name
Updated macro names per standard in c185d46 of lp8