Revert "ran drc/erc. fixed a clearence and some naming."

This reverts commit c68898d5cc2e314bcdbad39f0846ce49c5a59f39.