Japan PM to name new Cabinet, shifting some over church ties