Refactor our modules to standarize Druid node naming convention

This pull request refactors and renames some modules to standarize the Druid node naming convention.