diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java
index f3977938..3bb40c8d 100644
--- a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java
+++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java
@@ -22,7 +22,7 @@ public interface VisibilitySettings {
      * @return the visibility
      * @since 1
      */
-    @NotNull Visibility getVisibility();
+    @NotNull Visibility getGlobalVisibility();
 
     /**
      * Sets the visibility of the hologram. This value only affects player which do not have an individual visibility
@@ -31,10 +31,10 @@ public interface VisibilitySettings {
      * @param visibility the new visibility
      * @since 1
      */
-    void setVisibility(@NotNull Visibility visibility);
+    void setGlobalVisibility(@NotNull Visibility visibility);
 
     /**
-     * Sets the visibility for a specific player, overriding the global value of ({@link #getVisibility()}).
+     * Sets the visibility for a specific player, overriding the global value of ({@link #getGlobalVisibility()}).
      * The individual visibility value can be removed with {@link #removeIndividualVisibility(Player)}.
      *
      * @since 1
@@ -43,14 +43,14 @@ public interface VisibilitySettings {
 
     /**
      * Removes the individual visibility for a player. The visibility for the player would then be determined by the
-     * global visibility ({@link #getVisibility()}).
+     * global visibility ({@link #getGlobalVisibility()}).
      *
      * @since 1
      */
     void removeIndividualVisibility(@NotNull Player player);
 
     /**
-     * Removes the individual visibility  all players which have one.
+     * Removes the individual visibility of all players which have one.
      *
      * @since 1
      */
diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickableHologramLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickableHologramLine.java
index 88d87ea9..d0f4263b 100644
--- a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickableHologramLine.java
+++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickableHologramLine.java
@@ -20,7 +20,7 @@ public interface ClickableHologramLine extends HologramLine {
      * @return the current click listener, null if not present
      * @since 1
      */
-    @Nullable ClickListener getClickListener();
+    @Nullable HologramLineClickListener getClickListener();
 
     /**
      * Sets the click listener.
@@ -28,6 +28,6 @@ public interface ClickableHologramLine extends HologramLine {
      * @param clickListener the new click listener, null to unset
      * @since 1
      */
-    void setClickListener(@Nullable ClickListener clickListener);
+    void setClickListener(@Nullable HologramLineClickListener clickListener);
 
 }
diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickListener.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickListener.java
similarity index 89%
rename from api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickListener.java
rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickListener.java
index 80be00a1..bbdd4992 100644
--- a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickListener.java
+++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickListener.java
@@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
  * @since 1
  */
 @FunctionalInterface
-public interface ClickListener {
+public interface HologramLineClickListener {
 
     /**
      * @since 1
diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/PickupListener.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupListener.java
similarity index 90%
rename from api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/PickupListener.java
rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupListener.java
index 92756d79..6b12c7e6 100644
--- a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/PickupListener.java
+++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupListener.java
@@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
  * @since 1
  */
 @FunctionalInterface
-public interface PickupListener {
+public interface HologramLinePickupListener {
 
     /**
      * @since 1
diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ItemHologramLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ItemHologramLine.java
index f227fb8e..d9c5b335 100644
--- a/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ItemHologramLine.java
+++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ItemHologramLine.java
@@ -35,7 +35,7 @@ public interface ItemHologramLine extends ClickableHologramLine {
      * @return the current pickup listener, null if not present
      * @since 1
      */
-    @Nullable PickupListener getPickupListener();
+    @Nullable HologramLinePickupListener getPickupListener();
 
     /**
      * Sets the pickup listener.
@@ -43,6 +43,6 @@ public interface ItemHologramLine extends ClickableHologramLine {
      * @param pickupListener the new pickup listener, null to unset
      * @since 1
      */
-    void setPickupListener(@Nullable PickupListener pickupListener);
+    void setPickupListener(@Nullable HologramLinePickupListener pickupListener);
 
 }
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIClickableHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIClickableHologramLine.java
index d55b04e9..0b26585e 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIClickableHologramLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIClickableHologramLine.java
@@ -5,7 +5,7 @@
  */
 package me.filoghost.holographicdisplays.plugin.api.current;
 
-import me.filoghost.holographicdisplays.api.hologram.line.ClickListener;
+import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickListener;
 import me.filoghost.holographicdisplays.api.hologram.line.ClickableHologramLine;
 import me.filoghost.holographicdisplays.plugin.hologram.base.ClickCallbackProvider;
 import org.bukkit.entity.Player;
@@ -20,7 +20,7 @@ interface APIClickableHologramLine extends ClickableHologramLine, APIHologramLin
     @Override
     default void invokeClickCallback(Player player) {
         try {
-            ClickListener clickListener = getClickListener();
+            HologramLineClickListener clickListener = getClickListener();
             if (clickListener != null) {
                 clickListener.onClick(new SimpleHologramLineClickEvent(player));
             }
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIItemHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIItemHologramLine.java
index f7a50da5..4aa8677f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIItemHologramLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APIItemHologramLine.java
@@ -5,9 +5,9 @@
  */
 package me.filoghost.holographicdisplays.plugin.api.current;
 
-import me.filoghost.holographicdisplays.api.hologram.line.ClickListener;
+import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickListener;
 import me.filoghost.holographicdisplays.api.hologram.line.ItemHologramLine;
-import me.filoghost.holographicdisplays.api.hologram.line.PickupListener;
+import me.filoghost.holographicdisplays.api.hologram.line.HologramLinePickupListener;
 import me.filoghost.holographicdisplays.plugin.hologram.base.BaseItemHologramLine;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -15,32 +15,32 @@ import org.jetbrains.annotations.Nullable;
 
 class APIItemHologramLine extends BaseItemHologramLine implements ItemHologramLine, APIClickableHologramLine {
 
-    private PickupListener pickupListener;
-    private ClickListener clickListener;
+    private HologramLinePickupListener pickupListener;
+    private HologramLineClickListener clickListener;
 
     APIItemHologramLine(APIHologram hologram, ItemStack itemStack) {
         super(hologram, itemStack);
     }
 
     @Override
-    public @Nullable PickupListener getPickupListener() {
+    public @Nullable HologramLinePickupListener getPickupListener() {
         return pickupListener;
     }
 
     @Override
-    public void setPickupListener(@Nullable PickupListener pickupListener) {
+    public void setPickupListener(@Nullable HologramLinePickupListener pickupListener) {
         checkNotDeleted();
 
         this.pickupListener = pickupListener;
     }
 
     @Override
-    public @Nullable ClickListener getClickListener() {
+    public @Nullable HologramLineClickListener getClickListener() {
         return clickListener;
     }
 
     @Override
-    public void setClickListener(@Nullable ClickListener clickListener) {
+    public void setClickListener(@Nullable HologramLineClickListener clickListener) {
         checkNotDeleted();
 
         this.clickListener = clickListener;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java
index 7c235a6e..ecedae49 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/APITextHologramLine.java
@@ -6,7 +6,7 @@
 package me.filoghost.holographicdisplays.plugin.api.current;
 
 import me.filoghost.holographicdisplays.api.hologram.ResolvePlaceholders;
-import me.filoghost.holographicdisplays.api.hologram.line.ClickListener;
+import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickListener;
 import me.filoghost.holographicdisplays.api.hologram.line.TextHologramLine;
 import me.filoghost.holographicdisplays.plugin.hologram.base.BaseTextHologramLine;
 import org.jetbrains.annotations.Nullable;
@@ -15,7 +15,7 @@ class APITextHologramLine extends BaseTextHologramLine implements TextHologramLi
 
     private final APIHologram hologram;
 
-    private ClickListener clickListener;
+    private HologramLineClickListener clickListener;
 
     APITextHologramLine(APIHologram hologram, String text) {
         super(hologram, text);
@@ -28,14 +28,14 @@ class APITextHologramLine extends BaseTextHologramLine implements TextHologramLi
     }
 
     @Override
-    public void setClickListener(@Nullable ClickListener clickListener) {
+    public void setClickListener(@Nullable HologramLineClickListener clickListener) {
         checkNotDeleted();
 
         this.clickListener = clickListener;
     }
 
     @Override
-    public @Nullable ClickListener getClickListener() {
+    public @Nullable HologramLineClickListener getClickListener() {
         return clickListener;
     }
 
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultVisibilitySettings.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultVisibilitySettings.java
index 1a7f96ec..fcbb744b 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultVisibilitySettings.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultVisibilitySettings.java
@@ -24,12 +24,12 @@ public class DefaultVisibilitySettings implements VisibilitySettings {
     }
 
     @Override
-    public @NotNull Visibility getVisibility() {
+    public @NotNull Visibility getGlobalVisibility() {
         return globalVisibility;
     }
 
     @Override
-    public void setVisibility(@NotNull Visibility visibility) {
+    public void setGlobalVisibility(@NotNull Visibility visibility) {
         if (this.globalVisibility == visibility) {
             return;
         }
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManager.java
index ccdc313e..9fa003ea 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManager.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManager.java
@@ -21,12 +21,12 @@ class V2VisibilityManager implements VisibilityManager {
 
     @Override
     public boolean isVisibleByDefault() {
-        return v3VisibilitySettings.getVisibility() == Visibility.VISIBLE;
+        return v3VisibilitySettings.getGlobalVisibility() == Visibility.VISIBLE;
     }
 
     @Override
     public void setVisibleByDefault(boolean visibleByDefault) {
-        v3VisibilitySettings.setVisibility(visibleByDefault ? Visibility.VISIBLE : Visibility.HIDDEN);
+        v3VisibilitySettings.setGlobalVisibility(visibleByDefault ? Visibility.VISIBLE : Visibility.HIDDEN);
     }
 
     @Override