fix grave yard naming - fixes #1110