Revert "trebuchet: derive the grain name from the repo name"

This reverts commit 198d191c3ffa9f8bda02b590c50d99c298ea4b52.

Change-Id: I23b27ed86e2a6e876078840e5ee081b18da4c624