diff --git a/src/nhttpd/tuxboxapi/controlapi.h b/src/nhttpd/tuxboxapi/controlapi.h
index b266e85d4..c074770d7 100644
--- a/src/nhttpd/tuxboxapi/controlapi.h
+++ b/src/nhttpd/tuxboxapi/controlapi.h
@@ -153,10 +153,10 @@ public:
 	CControlAPI(CNeutrinoAPI *_NeutrinoAPI);
 
 	// virtual functions for HookHandler/Hook
-	virtual std::string getHookName(void) {return std::string("mod_ControlAPI");}
-	virtual std::string 	getHookVersion(void) {return std::string("$Revision$");}
-	virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
-	virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
+	virtual std::string	getHookName(void) {return std::string("mod_ControlAPI");}
+	virtual std::string	getHookVersion(void) {return std::string("$Revision$");}
+	virtual THandleStatus	Hook_SendResponse(CyhookHandler *hh);
+	virtual THandleStatus	Hook_PrepareResponse(CyhookHandler *hh);
 };
 
 #endif /* __nhttpd_neutrinocontrolapi_hpp__ */
diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.h b/src/nhttpd/tuxboxapi/neutrinoyparser.h
index 7a0410b8b..73714ea44 100644
--- a/src/nhttpd/tuxboxapi/neutrinoyparser.h
+++ b/src/nhttpd/tuxboxapi/neutrinoyparser.h
@@ -60,8 +60,9 @@ public:
 
 	// virtual functions for BaseClass
 	virtual std::string 	YWeb_cgi_func(CyhookHandler *hh, std::string ycmd);
+
 	// virtual functions for HookHandler/Hook
-	virtual std::string 	getHookName(void) {return std::string("mod_NeutrinoYParser-Coolstream");}
+	virtual std::string 	getHookName(void) {return std::string("mod_NeutrinoYParser");}
 	virtual std::string 	getHookVersion(void) {return std::string("$Revision$");}
 	virtual THandleStatus	Hook_SendResponse(CyhookHandler *hh);
 	virtual THandleStatus 	Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
diff --git a/src/nhttpd/yhttpd_mods/mod_auth.h b/src/nhttpd/yhttpd_mods/mod_auth.h
index 4efdcd8e9..9c44c325f 100644
--- a/src/nhttpd/yhttpd_mods/mod_auth.h
+++ b/src/nhttpd/yhttpd_mods/mod_auth.h
@@ -17,16 +17,12 @@ public:
 	}
 	;
 
-	// Hooks
-	virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
-	virtual std::string getHookName(void) {
-		return std::string("mod_auth");
-	}
-	virtual std::string getHookVersion(void) {
-		return std::string("$Revision$");
-	}
-	virtual THandleStatus Hook_ReadConfig(CConfigFile *Config,
-			CStringList &ConfigList);
+	// virtual functions for HookHandler/Hook
+	virtual std::string	getHookName(void) {return std::string("mod_auth");}
+	virtual std::string	getHookVersion(void) {return std::string("$Revision$");}
+	virtual THandleStatus	Hook_PrepareResponse(CyhookHandler *hh);
+	virtual THandleStatus	Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
+
 protected:
 	bool CheckAuth(CyhookHandler *hh);
 	std::string decodeBase64(const char *b64buffer);
diff --git a/src/nhttpd/yhttpd_mods/mod_cache.h b/src/nhttpd/yhttpd_mods/mod_cache.h
index d4172e6aa..b380c1b38 100644
--- a/src/nhttpd/yhttpd_mods/mod_cache.h
+++ b/src/nhttpd/yhttpd_mods/mod_cache.h
@@ -48,12 +48,12 @@ public:
 	static void RemoveCategoryFromCache(std::string category);
 	static void DeleteCache(void);
 
-	// Hooks
+	// virtual functions for HookHandler/Hook
+	virtual std::string 	getHookName(void) {return std::string("mod_cache");}
+	virtual std::string 	getHookVersion(void) {return std::string("$Revision$");}
 	virtual THandleStatus 	Hook_PrepareResponse(CyhookHandler *hh);
 	virtual THandleStatus 	Hook_SendResponse(CyhookHandler *hh);
-	virtual std::string 	getHookVersion(void) {return std::string("$Revision$");}
-	virtual std::string 	getHookName(void) {return std::string("mod_cache");}
-	virtual THandleStatus 	Hook_ReadConfig(CConfigFile *Config,CStringList &ConfigList);
+	virtual THandleStatus 	Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
 };
 
 #endif /* __yhttpd_mod_cache_h__ */
diff --git a/src/nhttpd/yhttpd_mods/mod_sendfile.h b/src/nhttpd/yhttpd_mods/mod_sendfile.h
index e4294a25f..4dfa4af7f 100644
--- a/src/nhttpd/yhttpd_mods/mod_sendfile.h
+++ b/src/nhttpd/yhttpd_mods/mod_sendfile.h
@@ -28,11 +28,11 @@ public:
 	CmodSendfile(){};
 	~CmodSendfile(void){};
 
-	// Hooks
-	virtual THandleStatus 	Hook_PrepareResponse(CyhookHandler *hh);
-//	virtual THandleStatus 	Hook_SendResponse(CyhookHandler *hh);
+	// virtual functions for HookHandler/Hook
 	virtual std::string 	getHookName(void) {return std::string("mod_sendfile");}
 	virtual std::string 	getHookVersion(void) {return std::string("$Revision$");}
+	virtual THandleStatus 	Hook_PrepareResponse(CyhookHandler *hh);
+//	virtual THandleStatus 	Hook_SendResponse(CyhookHandler *hh);
 	virtual THandleStatus 	Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
 };
 
diff --git a/src/nhttpd/yhttpd_mods/mod_weblog.h b/src/nhttpd/yhttpd_mods/mod_weblog.h
index bcdf2d96e..4e0d5ca02 100644
--- a/src/nhttpd/yhttpd_mods/mod_weblog.h
+++ b/src/nhttpd/yhttpd_mods/mod_weblog.h
@@ -33,10 +33,10 @@ public:
 	void 		AddLogEntry_ELF(CyhookHandler *hh);
 	bool 		printf(const char *fmt, ...);
 
-	// Hooks
-	virtual THandleStatus 	Hook_EndConnection(CyhookHandler *hh);
+	// virtual functions for HookHandler/Hook
 	virtual std::string 	getHookName(void) {return std::string("mod_weblog");}
 	virtual std::string 	getHookVersion(void) {return std::string("$Revision$");}
+	virtual THandleStatus 	Hook_EndConnection(CyhookHandler *hh);
 	virtual THandleStatus 	Hook_ReadConfig(CConfigFile *Config, CStringList &ConfigList);
 };
 #endif // __yhttpd_mod_weblog_h__
diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.h b/src/nhttpd/yhttpd_mods/mod_yparser.h
index dc6209ec2..bbe7f9dac 100644
--- a/src/nhttpd/yhttpd_mods/mod_yparser.h
+++ b/src/nhttpd/yhttpd_mods/mod_yparser.h
@@ -113,9 +113,10 @@ public:
 
 	// virtual functions for BaseClass
 	virtual std::string 	YWeb_cgi_func(CyhookHandler *hh, std::string ycmd);
+
 	// virtual functions for HookHandler/Hook
-	virtual std::string 	getHookVersion(void) {return std::string("$Revision$");}
 	virtual std::string 	getHookName(void) {return "mod_yparser";}
+	virtual std::string 	getHookVersion(void) {return std::string("$Revision$");}
 	virtual THandleStatus 	Hook_SendResponse(CyhookHandler *hh);
 };