Corrected the naming, which is RFC-compliant now. Tested subarch and no-subarch builds on i386.
Changed paths: