Merge "shared: Partly revert naming logic"