Changed up standard typedefs