diff --git a/src/Hardware.tex b/src/Hardware.tex
index 8640076..7263a3d 100644
--- a/src/Hardware.tex
+++ b/src/Hardware.tex
@@ -20,10 +20,10 @@ Main hardware components in an optical \gls{ground-station}:
 \begin{itemize}
 	\item Lens. \index{lens}
 	\item Camera. \index{camera}
-	\item Computer. \index{computer}
+	\item \Gls{embedded system} (computer). \index{embedded system}
 \end{itemize}
 \end{mdframed}
-\index{lens}\index{camera}\index{embedded computer}
+\index{lens}\index{camera}\index{embedded system}
 
 Other components:
 \begin{mdframed}[backgroundcolor=blue!10,linecolor=blue!30]
@@ -82,7 +82,7 @@ Lenses being tested:
 
 \section{Embedded Computer}
 \label{sec:hardware-computer}
-\index{hardware}\index{embedded computer}
+\index{hardware}\index{embedded system}
 \Glspl{embedded system}, such as \gls{Raspberry Pi}, that can be used.
 \index{Raspberry Pi}
 
@@ -98,7 +98,7 @@ Lenses being tested:
 
 \subsection{Comparison}
 Comparing \glspl{embedded system} for \gls{SatNOGS-Optical}.
-\index{embedded computer}
+\index{embedded system}
 
 \begin{center}
 \begin{table}[ht]
diff --git a/src/Software.tex b/src/Software.tex
index 9690a0d..79ba87c 100644
--- a/src/Software.tex
+++ b/src/Software.tex
@@ -41,7 +41,7 @@ Note: the SatNOGS network is not yet ready for optical data.
 
 Setup an \gls{embedded system}, such as a \gls{Raspberry Pi} or an Odroid N2,
 with \gls{Debian} stable (11/Bullseye) or testing (Bookworm).
-\index{embedded computer}\index{Odroid}\index{Debian}
+\index{embedded system}\index{Odroid}\index{Debian}
 
 See each \gls{software repository} for latest documentation.
 
@@ -340,7 +340,7 @@ Software that can be used with \gls{telescope} tracking mounts:
 \end{description}
 \end{mdframed}
 \index{telescope}\index{INDI}\index{KStars}\index{Ekos}\index{Stellarium}
-\index{INDIGO}\index{sky charts}
+\index{INDIGO}\index{sky chart}
 
 Using \gls{INDI} with \gls{KStars} and Ekos on a Sky-Watcher or \gls{Celestron}
 \gls{telescope} mount is a known working solution.
@@ -618,7 +618,7 @@ An overview of steps:
          and \texttt{\gls{V4L2}} for the \gls{CCD}, which will work with The Imaging Source
          camera used in this example. Alternatively, the ZWO ASI could be used with a similar configuration.
 	\item The Ekos configuration should also be set to use the remote \texttt{indiserver}
-	\gls{IP} address of the embedded computer \gls{USB} connected to the Sky-Watcher mount.
+	\gls{IP} address of the embedded system \gls{USB} connected to the Sky-Watcher mount.
 	\item Hit the start button to start Ekos/\gls{INDI}.
 	\item On the screen that pops up, confirm all the tabs are good.
 	\item Check the last configuration tab for the camera, it often