Bug fixes

Multiple bug fixes:
1. No need for localization (resource updates)
2. All classes start with AD
3. All methods in category extensions start with "ad".