Changed typedef names to satisfy convention