I just noticed that the @package also seem to be incorrect in the avatar files. I'm guessing that should always be phpBB3 and not avatar, right?