Rename resources with dashes

Change-Id: Ib14e47778fe9d0bea845da14de8af0272c7c1cd1