changed some names and made some edits thanks to /u/Reostra

Signed-off-by: Eliminioa <jmsboggs@gmail.com>