smaccm-ins: change a few build, naming conventions