Converted some code to aliased classes and fixed up non-string callbacks + translate