change methods name
Merge remote-tracking branch 'origin/dev' into tests-arquillian