Refactor of individual states to give unique state-names to components that are similar across server types.  Needed to allow for mix + match of states on machines w/o conflicts