Use activity singular where appropriate, fixes #5