Refactor naming and allow removing shares