acu182180 Fix specs and fix up variable names slightly