diff --git a/camo-image-proxy.php b/camo-image-proxy.php
index 2403a197c406dc67441192c366f677b95e2aca66..9ed3d6e82970288e689fb4688c5ea76568ee3433 100755
--- a/camo-image-proxy.php
+++ b/camo-image-proxy.php
@@ -14,7 +14,7 @@
 
 namespace Camo_Image_Proxy;
 
-define( __NAMESPACE__ . '\PLUGIN_PATH', dirname( __FILE__ ) );
+const PLUGIN_PATH = __DIR__;
 
 /**
  * Trait for singletons
diff --git a/inc/class-options-page.php b/inc/class-options-page.php
index 0ed5cdb41bf85cbf0249e00b166abcd095d37835..2e9540697b0a2be04cf06dbc1d68c149581a28cf 100644
--- a/inc/class-options-page.php
+++ b/inc/class-options-page.php
@@ -76,7 +76,7 @@ class Options_Page {
 		?>
 		<input
 			type="<?php echo esc_attr( $input_type ); ?>"
-			name="<?php echo esc_html( $name ); ?>"
+			name="<?php echo esc_attr( $name ); ?>"
 			class="regular-text"
 			id="<?php echo esc_attr( $html_id ); ?>"
 			value="<?php echo esc_attr( $value ); ?>"