Hopefully this will deal with all future naming changes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>