Correct naming and path