Refractor

Changed some namings in order to make it shorter while keeping it
understandable.