Removed dependencies to better match HW design.
Changed names to better match definitions.