acu130287 - Convert from mapper to router terminology and add unit specs