Updating naming and format

made it 3.4 compatible and fixed the spacing on different things, plus
the naming.