Merge pull request #476 from thi/rename-old-apg-things

Rename old mentionings of APG-named things