refactored all files to include new device memory naming convention