Remove bad naming, some refacto…
Update README after previous refacto