refractored names + docs usage
tests fix