refactor naming to match RUFF "N999", and "N802"

@jgonzg @stehr01 We need to check wehter this will have dependency effects.