renamed some variables and the enum and added using-declarations
renamed some variables and the enum and added using-declarations

patrikhuber/eos,patrikhuber/eos,ming81/eos,patrikhuber/eos,icyrizard/eos,icyrizard/eos,icyrizard/eos