No magic strings scattered all over

Signed-off-by: Mike Gehard <mgehard@pivotallabs.com>