Fixes #46 by adding all listed enumerations to discovery_method
Fixes #47 by renaming enumeration
Fixes #48 by renaming enumeration
Merge pull request #50 from vz-risk/issue46-discovery_method

Fixes #46 #47 #48 by adding / fixing all listed enumerations in discovery_method