updated some names (methods, constants, …)