- Fix class and packages names
# Were broken before this change, but did not surface until now
# as the more complex fully qualified calculation made this work
# (albeit being incorrect)