diff --git a/cherokee/buffer.c b/cherokee/buffer.c
index 7885505dc..11a4b1e66 100644
--- a/cherokee/buffer.c
+++ b/cherokee/buffer.c
@@ -657,7 +657,7 @@ cherokee_buffer_prepend (cherokee_buffer_t *buf, char *txt, size_t size)
 
 
 int   
-cherokee_buffer_is_endding (cherokee_buffer_t *buf, char c)
+cherokee_buffer_is_ending (cherokee_buffer_t *buf, char c)
 {
 	if (cherokee_buffer_is_empty(buf))
 		return 0;
@@ -738,7 +738,7 @@ cherokee_buffer_ensure_size (cherokee_buffer_t *buf, size_t size)
 
 
 ret_t 
-cherokee_buffer_drop_endding (cherokee_buffer_t *buffer, cuint_t num_chars)
+cherokee_buffer_drop_ending (cherokee_buffer_t *buffer, cuint_t num_chars)
 {
 	int num;
 
diff --git a/cherokee/buffer.h b/cherokee/buffer.h
index c438ba74a..427a824f8 100644
--- a/cherokee/buffer.h
+++ b/cherokee/buffer.h
@@ -92,7 +92,7 @@ ret_t cherokee_buffer_add_chunked        (cherokee_buffer_t  *buf, char *txt, si
 ret_t cherokee_buffer_add_buffer_chunked (cherokee_buffer_t  *buf, cherokee_buffer_t *buf2);
 
 ret_t cherokee_buffer_move_to_begin      (cherokee_buffer_t  *buf, cuint_t pos);
-ret_t cherokee_buffer_drop_endding       (cherokee_buffer_t  *buf, cuint_t num_chars);
+ret_t cherokee_buffer_drop_ending        (cherokee_buffer_t  *buf, cuint_t num_chars);
 ret_t cherokee_buffer_multiply           (cherokee_buffer_t  *buf, int num);
 ret_t cherokee_buffer_swap_chars         (cherokee_buffer_t  *buf, char a, char b);
 ret_t cherokee_buffer_remove_dups        (cherokee_buffer_t  *buf, char c);
@@ -105,7 +105,7 @@ ret_t cherokee_buffer_trim               (cherokee_buffer_t  *buf);
 ret_t cherokee_buffer_ensure_addlen      (cherokee_buffer_t  *buf, size_t alen);
 ret_t cherokee_buffer_ensure_size        (cherokee_buffer_t  *buf, size_t size);
 
-int    cherokee_buffer_is_endding        (cherokee_buffer_t  *buf, char c);
+int    cherokee_buffer_is_ending         (cherokee_buffer_t  *buf, char c);
 char   cherokee_buffer_end_char          (cherokee_buffer_t  *buf);
 size_t cherokee_buffer_cnt_spn           (cherokee_buffer_t  *buf, cuint_t offset, char *str);
 size_t cherokee_buffer_cnt_cspn          (cherokee_buffer_t  *buf, cuint_t offset, char *str);
diff --git a/cherokee/connection.c b/cherokee/connection.c
index 2201b98f2..f79eca879 100644
--- a/cherokee/connection.c
+++ b/cherokee/connection.c
@@ -983,7 +983,7 @@ get_host (cherokee_connection_t *conn,
 	/* RFC-1034: Dot ending host names
 	 */
 	if (cherokee_buffer_end_char (&conn->host) == '.')
-		cherokee_buffer_drop_endding (&conn->host, 1);
+		cherokee_buffer_drop_ending (&conn->host, 1);
 	
 	return ret_ok;
 }
@@ -1343,7 +1343,7 @@ parse_userdir (cherokee_connection_t *conn)
 	char *begin;
 	char *end_username;
 
-	/* Find user name endding:
+	/* Find user name ending:
 	 */
 	begin = &conn->request.buf[2];
 
@@ -1413,7 +1413,7 @@ cherokee_connection_get_request (cherokee_connection_t *conn)
 		post_len = conn->incoming_header.len - header_len;
 
 		cherokee_post_append (&conn->post, conn->incoming_header.buf + header_len, post_len);
-		cherokee_buffer_drop_endding (&conn->incoming_header, post_len);
+		cherokee_buffer_drop_ending (&conn->incoming_header, post_len);
 	}
 
 	/* Copy the request and query string
diff --git a/cherokee/connection_info.c b/cherokee/connection_info.c
index 686d7f5d4..9561c0273 100644
--- a/cherokee/connection_info.c
+++ b/cherokee/connection_info.c
@@ -190,7 +190,7 @@ cherokee_connection_info_fill_up (cherokee_connection_info_t *info, cherokee_con
 		
 		point = strchr (info->percent.buf, '.');
 		if (point != NULL) 
-			cherokee_buffer_drop_endding (&info->percent, (info->percent.buf + info->percent.len) - (point + 2)); 
+			cherokee_buffer_drop_ending (&info->percent, (info->percent.buf + info->percent.len) - (point + 2)); 
 	}
 	
 	/* Local icon
@@ -206,7 +206,7 @@ cherokee_connection_info_fill_up (cherokee_connection_info_t *info, cherokee_con
 
 		tmp = strchr (name.buf, '?');
 		if (tmp != NULL) 
-			cherokee_buffer_drop_endding (&name, (name.buf + name.len) - tmp);
+			cherokee_buffer_drop_ending (&name, (name.buf + name.len) - tmp);
 
 		tmp = strrchr (name.buf, '/');
 		if (tmp != NULL) 
diff --git a/cherokee/downloader.c b/cherokee/downloader.c
index a62e1da24..536c89e0c 100644
--- a/cherokee/downloader.c
+++ b/cherokee/downloader.c
@@ -274,7 +274,7 @@ downloader_send_buffer (cherokee_downloader_t *downloader, cherokee_buffer_t *bu
 	case ret_ok:
 		/* Drop the header that has been sent
 		 */
-		cherokee_buffer_drop_endding (buf, written);
+		cherokee_buffer_drop_ending (buf, written);
 		if (cherokee_buffer_is_empty (buf)) {
 			return ret_ok;
 		}
@@ -352,7 +352,7 @@ downloader_header_read (cherokee_downloader_t *downloader, cherokee_buffer_t *tm
 			downloader->info.body_recv += body_chunk;
 			cherokee_buffer_add (&downloader->body, downloader->reply_header.buf + len, body_chunk);
 
-			cherokee_buffer_drop_endding (&downloader->reply_header, body_chunk);
+			cherokee_buffer_drop_ending (&downloader->reply_header, body_chunk);
 		}
 
 		/* Try to read the "Content-Length" response header
diff --git a/cherokee/encoder_gzip.c b/cherokee/encoder_gzip.c
index e617ccd47..525454529 100644
--- a/cherokee/encoder_gzip.c
+++ b/cherokee/encoder_gzip.c
@@ -292,7 +292,7 @@ cherokee_encoder_gzip_flush (cherokee_encoder_gzip_t *encoder, cherokee_buffer_t
  		return ret; 
  	} 
 
-	/* Add the endding:
+	/* Add the ending:
 	 * +---+---+---+---+---+---+---+---+
 	 * |     CRC32     |     ISIZE     |
          * +---+---+---+---+---+---+---+---+
diff --git a/cherokee/handler_cgi_base.c b/cherokee/handler_cgi_base.c
index d696e47c3..e37a51ab8 100644
--- a/cherokee/handler_cgi_base.c
+++ b/cherokee/handler_cgi_base.c
@@ -661,7 +661,7 @@ cherokee_handler_cgi_base_extract_path (cherokee_handler_cgi_base_t *cgi, cherok
 					cherokee_buffer_add (&conn->pathinfo, p, end - p);
 	
 					pathinfo_len = end - p;
-					cherokee_buffer_drop_endding (&conn->local_directory, pathinfo_len);
+					cherokee_buffer_drop_ending (&conn->local_directory, pathinfo_len);
 				} 
 
 /* 				if (p <= begin) { */
@@ -707,7 +707,7 @@ cherokee_handler_cgi_base_extract_path (cherokee_handler_cgi_base_t *cgi, cherok
 bye:
 	/* Clean up the mess
 	 */
-	cherokee_buffer_drop_endding (&conn->local_directory, (req_len - pathinfo_len) - 1);
+	cherokee_buffer_drop_ending (&conn->local_directory, (req_len - pathinfo_len) - 1);
 	return ret;
 }
 
@@ -773,7 +773,7 @@ parse_header (cherokee_handler_cgi_base_t *cgi, cherokee_buffer_t *buffer)
 	 */
 	if ((buffer->len > 4) &&
 	    (strncmp (CRLF_CRLF, buffer->buf + buffer->len - 4, 4) == 0)) {
-		cherokee_buffer_drop_endding (buffer, 2);
+		cherokee_buffer_drop_ending (buffer, 2);
 	}
 	
 	TRACE (ENTRIES, "CGI header: %s\n", buffer->buf);
@@ -1045,7 +1045,7 @@ cherokee_handler_cgi_base_split_pathinfo (cherokee_handler_cgi_base_t *cgi,
 	 */
 	if (pathinfo_len > 0) {
 		cherokee_buffer_add (&conn->pathinfo, pathinfo, pathinfo_len);
-		cherokee_buffer_drop_endding (buf, pathinfo_len);
+		cherokee_buffer_drop_ending (buf, pathinfo_len);
 	}
 
 	TRACE (ENTRIES, "Pathinfo '%s'\n", conn->pathinfo.buf);
diff --git a/cherokee/handler_common.c b/cherokee/handler_common.c
index 68059d928..88ab68689 100644
--- a/cherokee/handler_common.c
+++ b/cherokee/handler_common.c
@@ -219,7 +219,7 @@ cherokee_handler_common_new (cherokee_handler_t **hdl, void *cnt, cherokee_modul
 		/* Copy the PathInfo and clean the request 
 		 */
 		cherokee_buffer_add (&conn->pathinfo, pathinfo, pathinfo_len);
-		cherokee_buffer_drop_endding (&conn->request, pathinfo_len);
+		cherokee_buffer_drop_ending (&conn->request, pathinfo_len);
 
 		/* Clean the local_directory, this connection is going
 		 * to restart the connection setup phase
@@ -231,7 +231,7 @@ cherokee_handler_common_new (cherokee_handler_t **hdl, void *cnt, cherokee_modul
 		return ret_eagain;
 	}	
 
-	cherokee_buffer_drop_endding (&conn->local_directory, conn->request.len);
+	cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len);
 
 	/* Is it a file?
 	 */
@@ -319,7 +319,7 @@ cherokee_handler_common_new (cherokee_handler_t **hdl, void *cnt, cherokee_modul
 			is_dir = ((ret == ret_ok) && S_ISDIR(info->st_mode));
 
 			cherokee_iocache_mmap_release (iocache, file);
-			cherokee_buffer_drop_endding (&conn->local_directory, index_len);
+			cherokee_buffer_drop_ending (&conn->local_directory, index_len);
 
 			TRACE (ENTRIES, "trying index '%s', exists %d\n", index, exists);
 
@@ -330,7 +330,7 @@ cherokee_handler_common_new (cherokee_handler_t **hdl, void *cnt, cherokee_modul
 			
 			/* Add the index file to the request and clean up
 			 */
-			cherokee_buffer_drop_endding (&conn->local_directory, conn->request.len);
+			cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len);
 			cherokee_buffer_add (&conn->request, index, index_len); 
 
 			TRACE_CONN(conn);
@@ -339,7 +339,7 @@ cherokee_handler_common_new (cherokee_handler_t **hdl, void *cnt, cherokee_modul
 
 		/* If the dir hasn't a index file, it uses dirlist
 		 */
-		cherokee_buffer_drop_endding (&conn->local_directory, conn->request.len);
+		cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len);
 		return cherokee_handler_dirlist_new (hdl, cnt, MODULE_PROPS(PROP_COMMON(props)->props_dirlist));
 	}
 
diff --git a/cherokee/handler_dirlist.c b/cherokee/handler_dirlist.c
index e2940f502..2fe4f2b2b 100644
--- a/cherokee/handler_dirlist.c
+++ b/cherokee/handler_dirlist.c
@@ -331,7 +331,7 @@ generate_file_entry (cherokee_handler_dirlist_t *dhdl, DIR *dir, cherokee_buffer
 		 */
 		re = cherokee_lstat (path->buf, &n->stat);
 		if (re < 0) {
-			cherokee_buffer_drop_endding (path, n->name_len);
+			cherokee_buffer_drop_ending (path, n->name_len);
 
 			free (n);
 			return ret_error;
@@ -339,7 +339,7 @@ generate_file_entry (cherokee_handler_dirlist_t *dhdl, DIR *dir, cherokee_buffer
 
 		/* Clean up and exit
 		 */
-		cherokee_buffer_drop_endding (path, n->name_len);
+		cherokee_buffer_drop_ending (path, n->name_len);
 
 		*ret_entry = n;
 		return ret_ok;
@@ -455,7 +455,7 @@ check_request_finish_with_slash (cherokee_handler_dirlist_t *dhdl)
 	cherokee_connection_t *conn = HANDLER_CONN(dhdl);
 
 	if ((cherokee_buffer_is_empty (&conn->request)) ||
-	    (!cherokee_buffer_is_endding (&conn->request, '/'))) 
+	    (!cherokee_buffer_is_ending (&conn->request, '/'))) 
 	{
 		/* Build the redirection address
 		 */
@@ -615,7 +615,7 @@ build_file_list (cherokee_handler_dirlist_t *dhdl)
 	/* Clean
 	 */
 	closedir(dir);
-	cherokee_buffer_drop_endding (&conn->local_directory, conn->request.len); /* 2 */
+	cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len); /* 2 */
 
 	/* Sort the file list
 	 */
@@ -681,7 +681,7 @@ read_notice_file (cherokee_handler_dirlist_t *dhdl)
 			cherokee_buffer_add (&conn->local_directory, filename, filename_len);
 			
 			ret = cherokee_buffer_read_file (&dhdl->header, conn->local_directory.buf);
-			cherokee_buffer_drop_endding (&conn->local_directory, conn->request.len + filename_len); /* undo */
+			cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len + filename_len); /* undo */
 		} else {
 			ret = cherokee_buffer_read_file (&dhdl->header, filename);
 		}
diff --git a/cherokee/handler_file.c b/cherokee/handler_file.c
index 58f51766b..3c9e595e7 100644
--- a/cherokee/handler_file.c
+++ b/cherokee/handler_file.c
@@ -530,7 +530,7 @@ cherokee_handler_file_init (cherokee_handler_file_t *fhdl)
 
 	/* Undo the local directory
 	 */
-	cherokee_buffer_drop_endding (&conn->local_directory, conn->request.len);	
+	cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len);	
 	return ret;
 }
 
diff --git a/cherokee/handler_nn.c b/cherokee/handler_nn.c
index a6204d82f..179724c65 100644
--- a/cherokee/handler_nn.c
+++ b/cherokee/handler_nn.c
@@ -132,7 +132,7 @@ cherokee_handler_nn_new (cherokee_handler_t **hdl, void *cnt, cherokee_module_pr
 
 	cherokee_buffer_add (&conn->local_directory, conn->request.buf, conn->request.len);
 	stat_ret = stat (conn->local_directory.buf, &info);
-	cherokee_buffer_drop_endding (&conn->local_directory, conn->request.len);
+	cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len);
 	
 	/* Maybe the file/dir exists
 	 */
diff --git a/cherokee/handler_redir.c b/cherokee/handler_redir.c
index 1966098d9..575258180 100644
--- a/cherokee/handler_redir.c
+++ b/cherokee/handler_redir.c
@@ -176,7 +176,7 @@ match_and_substitute (cherokee_handler_redir_t *n)
 			if (len > 0) {
 				cherokee_buffer_clean (&conn->query_string);
 				cherokee_buffer_add (&conn->query_string, args, len);
-				cherokee_buffer_drop_endding (&conn->request, len+1);
+				cherokee_buffer_drop_ending (&conn->request, len+1);
 			}
 
 			TRACE (ENTRIES, "Hidden redirect to: request=\"%s\" query_string=\"%s\"\n", 
@@ -201,7 +201,7 @@ match_and_substitute (cherokee_handler_redir_t *n)
 
 out:
 	if (! cherokee_buffer_is_empty (&conn->query_string))
-		cherokee_buffer_drop_endding (&conn->request, conn->query_string.len + 1);
+		cherokee_buffer_drop_ending (&conn->request, conn->query_string.len + 1);
 
 	return ret;
 }
@@ -318,7 +318,7 @@ ret_t
 cherokee_handler_redir_init (cherokee_handler_redir_t *n)
 {
 	int                    request_end;
-	char                  *request_endding;
+	char                  *request_ending;
 	cherokee_connection_t *conn = HANDLER_CONN(n);
     
 	/* Maybe ::new -> match_and_substitute() has already set
@@ -339,11 +339,11 @@ cherokee_handler_redir_init (cherokee_handler_redir_t *n)
 	/* Try with URL directive
 	 */
 	request_end = (conn->request.len - conn->web_directory.len);
-	request_endding = conn->request.buf + conn->web_directory.len;
+	request_ending = conn->request.buf + conn->web_directory.len;
 	
 	cherokee_buffer_ensure_size (&conn->redirect, request_end + HDL_REDIR_PROPS(n)->url.len +1);
 	cherokee_buffer_add_buffer (&conn->redirect, &HDL_REDIR_PROPS(n)->url);
-	cherokee_buffer_add (&conn->redirect, request_endding, request_end);
+	cherokee_buffer_add (&conn->redirect, request_ending, request_end);
 
 	conn->error_code = http_moved_permanently;
 	return ret_ok;
diff --git a/cherokee/main_tweak.c b/cherokee/main_tweak.c
index df08b7d5b..6440bc3bf 100644
--- a/cherokee/main_tweak.c
+++ b/cherokee/main_tweak.c
@@ -178,7 +178,7 @@ look_for_logname (cherokee_buffer_t *logfile, cherokee_buffer_t *logname)
 		goto error;
 	}
 
-	cherokee_buffer_drop_endding (&dirname, (dirname.buf + dirname.len) - (tmp + 1));
+	cherokee_buffer_drop_ending (&dirname, (dirname.buf + dirname.len) - (tmp + 1));
 
 	/* Read files
 	 */
@@ -197,7 +197,7 @@ look_for_logname (cherokee_buffer_t *logfile, cherokee_buffer_t *logname)
 		cherokee_buffer_add (&dirname, file->d_name, d_name_len);
 
 		if (cherokee_buffer_cmp_buf (&dirname, logname)) {
-			cherokee_buffer_drop_endding (&dirname, d_name_len);
+			cherokee_buffer_drop_ending (&dirname, d_name_len);
 			continue;
 		}
 		
@@ -209,7 +209,7 @@ look_for_logname (cherokee_buffer_t *logfile, cherokee_buffer_t *logname)
 				max = val;
 		}
 
-		cherokee_buffer_drop_endding (&dirname, d_name_len);
+		cherokee_buffer_drop_ending (&dirname, d_name_len);
 	}
 
 	/* Build the new filename
diff --git a/cherokee/plugin_loader.c b/cherokee/plugin_loader.c
index 5673eec8c..8ee97c32b 100644
--- a/cherokee/plugin_loader.c
+++ b/cherokee/plugin_loader.c
@@ -533,7 +533,7 @@ cherokee_plugin_loader_get_mods_info (cherokee_plugin_loader_t *loader,
 	 */
 	cherokee_avl_while (&loader->table, while_print_name, builtin, NULL, NULL);
 	if (builtin->len > 2)
-		cherokee_buffer_drop_endding (builtin, 2);
+		cherokee_buffer_drop_ending (builtin, 2);
 			
 	return ret_ok;
 }
diff --git a/cherokee/rule_request.c b/cherokee/rule_request.c
index 69c7d7f5f..45374fed4 100644
--- a/cherokee/rule_request.c
+++ b/cherokee/rule_request.c
@@ -92,7 +92,7 @@ match (cherokee_rule_request_t *rule, cherokee_connection_t *conn)
 
 restore:
         if (! cherokee_buffer_is_empty (&conn->query_string)) {
-                cherokee_buffer_drop_endding (&conn->request, conn->query_string.len + 1);
+                cherokee_buffer_drop_ending (&conn->request, conn->query_string.len + 1);
         }
 
 	return ret;
diff --git a/cherokee/url.c b/cherokee/url.c
index 3b1d86c8f..54faae4f0 100644
--- a/cherokee/url.c
+++ b/cherokee/url.c
@@ -169,7 +169,7 @@ cherokee_url_parse_guts (cherokee_url_t    *url,
 
 		/* .. and remove it
 		 */
-		ret = cherokee_buffer_drop_endding (&url->host, strlen(port));
+		ret = cherokee_buffer_drop_ending (&url->host, strlen(port));
 		if (unlikely(ret < ret_ok)) return ret;
 	}
 	
diff --git a/cherokee/util.c b/cherokee/util.c
index 682ed5498..4e9562f73 100644
--- a/cherokee/util.c
+++ b/cherokee/util.c
@@ -1293,8 +1293,8 @@ cherokee_print_wrapped (cherokee_buffer_t *buffer)
 ret_t
 cherokee_fix_dirpath (cherokee_buffer_t *buf)
 {
-	while (cherokee_buffer_is_endding(buf, '/')) {
-		cherokee_buffer_drop_endding (buf, 1);
+	while (cherokee_buffer_is_ending(buf, '/')) {
+		cherokee_buffer_drop_ending (buf, 1);
 	}
 
 	return ret_ok;
diff --git a/cherokee/validator_htpasswd.c b/cherokee/validator_htpasswd.c
index 8de982b89..9b538a196 100644
--- a/cherokee/validator_htpasswd.c
+++ b/cherokee/validator_htpasswd.c
@@ -262,7 +262,7 @@ request_isnt_passwd_file (cherokee_validator_htpasswd_t *htpasswd, cherokee_conn
 	}
 
 	if (conn->request.len > 0)
-		cherokee_buffer_drop_endding (&conn->local_directory, conn->request.len-1);              /* 1: remove */
+		cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len-1);              /* 1: remove */
 
 	return ret;
 }
diff --git a/cherokee/validator_plain.c b/cherokee/validator_plain.c
index bb4d525d9..476912815 100644
--- a/cherokee/validator_plain.c
+++ b/cherokee/validator_plain.c
@@ -133,7 +133,7 @@ cherokee_validator_plain_check (cherokee_validator_plain_t *plain, cherokee_conn
 		goto out;
 	}
 
-	if (! cherokee_buffer_is_endding(&file, '\n'))
+	if (! cherokee_buffer_is_ending(&file, '\n'))
 		cherokee_buffer_add_str (&file, "\n");
 
 	p   = file.buf;