Updated imports to reflect new naming scheme