diff --git a/data/abbr/aviation.csv b/data/abbr/aviation.csv
index 08e3528a..8e93285f 100644
--- a/data/abbr/aviation.csv
+++ b/data/abbr/aviation.csv
@@ -385,7 +385,7 @@ RADNET,Radar Network
 RAIM,Receiver Autonomous Integrity Monitoring (GPS)
 RAPCON,Radar Approach Control
 RAT,Reliability Acceptance Test (see also FAT and SAT)
-RAM,Radar Absorbent Material
+RAM,Royal Air Maroc
 RAP,Recognised Air Picture
 RASP,Recognised Air and Surveillance Picture
 RB,Relative Bearing
diff --git a/data/abbr/chemistry.csv b/data/abbr/chemistry.csv
index 12e8d28e..4d98304b 100644
--- a/data/abbr/chemistry.csv
+++ b/data/abbr/chemistry.csv
@@ -425,7 +425,6 @@ HOAc,Acetic Acid
 HOMO,Highest Occupied Molecular Orbital
 HOQS,Highest Occupied Quantum State
 HP,High Pressure
-hp,horsepower
 HPHT,High Pressure/High Temperature
 HPLC,High Pressure Liquid Chromatography
 HPPT,High Pressure Phase Transformation
diff --git a/data/abbr/computing.csv b/data/abbr/computing.csv
index a52663ef..1f4a599b 100644
--- a/data/abbr/computing.csv
+++ b/data/abbr/computing.csv
@@ -153,6 +153,7 @@ AFP,Apple Filing Protocol
 AFS,Andrew file system
 aglet,agile applet
 AGP,Accelerated Graphics Port
+AGI,Artificial General Intelligence
 AHA,Accelerated Hub Architecture
 AHIMA,American Health Information Management Association
 AHRQ,Agency for Healthcare Research and Quality
@@ -281,10 +282,6 @@ AWS,Amazon Web Services
 AWT,Abstract Window Toolkit
 AXI,automated X-ray inspection
 AXT,alien crosstalk
-B2B,Business to Business
-B2C,Business to Consumer
-B2G,"Business to Government, or Bitcoin2Gen"
-B2E,Business to Employee
 B8ZS,"bipolar 8-zero substitution, binary 8-zero substitution, clear channel, clear 64"
 BA,business agility
 BA,business analytics
@@ -1355,7 +1352,6 @@ HMIPv6,Hierarchical Mobile IPv6
 HMM,Hidden Markov Model
 HOLAP,hybrid online analytical processing
 HomeRF,home radio frequency
-HP,Hewlett-Packard
 HP,High Performance
 HP-GL,Hewlett-Packard Graphics Language
 HPC,High-Performance Computing
@@ -1911,7 +1907,6 @@ OID,object ID
 OLA,operational level agreement
 OLAP,online analytical processing
 OLE,Object Linking and Embedding
-OLED,light-emitting diode
 OLPC,One Laptop Per Child
 OLT,optical line terminal
 OLTP,On Line Transaction Processing
diff --git a/data/abbr/general.csv b/data/abbr/general.csv
index 41ec99fb..5622c017 100644
--- a/data/abbr/general.csv
+++ b/data/abbr/general.csv
@@ -500,6 +500,10 @@ AYU,As Yet Unknown
 AZ,"Arizona (postal symbol),Azerbaijan (ISO 3166 digram),Alkmaar Zaanstreek (Dutch football club)"
 AZE,Azerbaijan (ISO 3166 trigram)
 AZUR,"Actions en zone urbaine (French for: Urban Operations)"
+B2B,Business to Business
+B2C,Business to Consumer
+B2G,Business to Government
+B2E,Business to Employee
 BAR,"Barbados (IOC trigram,but not FIFA or ISO 3166),British American Racing,Browning Automatic Rifle,Buy-American Restrictions,BARD , Binational Agricultural Research and Development fund (between the US and Israel),BARDA , Biomedical Advanced Research and Development Agency,BART , Bay Area Rapid Transit,BAS , Battalion Aid Station,BASE , Building,Antenna,Span,Earth (parachute from),BASF , Badische Anilin und Soda Fabrik (Baden Aniline and Soda Factory,a German chemicals company),BASIC , Beginner's All-purpose Symbolic Instruction Code (acronym was added later,originally it was simply Basic),BAT , Basic Aid Training,BATF , U.S. Bureau of Alcohol,Tobacco,and Firearms,BATS , Behavior Analysis Training System ,Bradley Advanced Training System,BATTeRS , Bisei Asteroid Tracking Telescope for Rapid Survey,BB[edit]"
 BB,"Barbados (ISO 3166 digram),Boys' Brigade (Christian youth organization),Brigitte Bardot (actress),Bumblebee"
 BBB,"Better Business Bureau,Blood-brain barrier"
@@ -4041,8 +4045,6 @@ RAE,UK Royal Aircraft Establishment (-1991)
 RAF,Red Army Faction,Royal Air Force
 RAG,Raising and Giving,Rocket Antitank Grenade
 RAGBRAI,Register's Annual Great Bicycle Ride Across Iowa
-RAM,Rolling Airframe Missile,
-RAM,Royal Air Maroc
 Ramark,RAdar MARKer
 RAOC,Rear Area Operation Centre
 RAP, Radio Access Point,Radiological Assistance Program (U.S. Department of Energy),Rear Area Protection,Recognised [Operating/Operational] Air Picture,Recurring Advance Payment,Relational Associative Processor,Reliable Acoustic Path,Rocket-Assisted Projectile,Rule Against Perpetuities
diff --git a/data/abbr/military.csv b/data/abbr/military.csv
index 3bf385ef..126ea8e8 100644
--- a/data/abbr/military.csv
+++ b/data/abbr/military.csv
@@ -618,7 +618,7 @@ R&D,Research & Development
 R&R,Rest and Recuperation
 RA,Risk Assessment
 RAAWS,Radar Altimeter and Altitude Warning System
-RAM,Radar Absorbing Material
+RAM,"Radar Absorbing Material, Rolling Airframe Missile"
 RAST,Recovery Assist, Secure and Traverse system
 RATO,Rocket-Assisted Take-Off
 RC,Reserve Component