Changed naming and moved ints to enums.