Small fixes

- This time not controversial
- Fire Alarm capitalized in the same style than the Air Alarm and APC
due to it using area names, which are proper
Merge pull request #1190 from dylanstrategie/Name-Fixes

Small fixes