Rename some files so the puppet loader can find them

Change-Id: I4a6847e744c91a3391ce40b549c9a4d1d92670f2