Modify via psr0-3 convention