fix: compiler warnings
chg: singuname stuff -> standard defines