Renamed files and variables to reflect existing DB hierarchy