Added checking for a few cases that are simply differently named.