Updated to an easier to maintain naming scheme