diff --git a/www/functions_SQLite.js b/www/functions_SQLite.js
index 5b31cfe..cf52d54 100644
--- a/www/functions_SQLite.js
+++ b/www/functions_SQLite.js
@@ -13,7 +13,7 @@ var getTagID = function(tagName, cb){
 	var db = new sqlite3.Database(dbFile);
 
 	db.serialize(function(){
-		var query = "SELECT id FROM TagData.tags WHERE tagName = ?";
+		var query = "SELECT id FROM tags WHERE tagName = ?";
 		var prepQuery = db.prepare(query);
 		prepQuery.all(tagName, function(err, rows){
 			prepQuery.finalize();
@@ -33,7 +33,7 @@ var getTagName = function(tagID, cb){
 	var db = new sqlite3.Database(dbFile);
 
 	db.serialize(function(){
-		var query = "SELECT tagName FROM TagData.tags WHERE id = ?";
+		var query = "SELECT tagName FROM tags WHERE id = ?";
 		var prepQuery = db.prepare(query);
 		prepQuery.all(tagID, function(err, rows){
 			prepQuery.finalize();
@@ -74,7 +74,7 @@ exports.addTag = function(req, res){
 	var db = new sqlite3.Database(dbFile);
 
 	db.serialize(function(){
-		var query = "INSERT INTO TagData.tags (tagName, units) VALUES (?, ?)";
+		var query = "INSERT INTO tags (tagName, units) VALUES (?, ?)";
 		var preqQuery = db.prepare(query);
 		prepQuery.run(req.params.tagName, req.params.units, function(err){
 			prepQuery.finalize();
@@ -94,7 +94,7 @@ exports.removeTag = function(req, res){
 	var db = new sqlite3.Database(dbFile);
 
 	db.serialize(function(){
-		var query = "UPDATE TagData.tags SET deleted = 1 WHERE id = ?";
+		var query = "UPDATE tags SET deleted = 1 WHERE id = ?";
 		var preqQuery = db.prepare(query);
 		prepQuery.run(req.params.tag, function(err) {
 			prepQuery.finalize();
@@ -114,7 +114,7 @@ exports.latestTagValue = function(req, res){
 	var db = new sqlite3.Database(dbFile);
 
 	db.serialize(function(){
-		var query = "SELECT * FROM TagData.values WHERE id = (SELECT MAX(id) FROM TagData.values WHERE tagID = (SELECT id FROM TagData.tags WHERE tagName = ?))";
+		var query = "SELECT * FROM vals WHERE id = (SELECT MAX(id) FROM vals WHERE tagID = (SELECT id FROM tags WHERE tagName = ?))";
 		var prepQuery = db.prepare(query);
 		prepQuery.run(req.params.tag, function(err) {
 			prepQuery.finalize();
@@ -129,12 +129,12 @@ exports.latestTagValue = function(req, res){
 	});
 };
 
-exports.seriesTagValues = function(req, res){
+exports.seriesTagvals = function(req, res){
 	var sqlite3 = require('sqlite3').verbose();
 	var db = new sqlite3.Database(dbFile);
 
 	db.serialize(function(){
-		var query = "SELECT * FROM TagData.values WHERE tagID = ? AND dateAdded > DATE_SUB(NOW(),INTERVAL ? HOUR)";
+		var query = "SELECT * FROM vals WHERE tagID = ? AND dateAdded > DATE_SUB(NOW(),INTERVAL ? HOUR)";
 		var prepQuery = db.prepare(query);
 		prepQuery.all(req.params.tag, req.params.hours, function(err, rows){
 			prepQuery.finalize();
@@ -143,7 +143,7 @@ exports.seriesTagValues = function(req, res){
 				console.log(err);
 				res.json({status:"error", message:err, query:query});
 			} else {
-				res.json({status:"OK", tag: req.params.tag, values:rows});
+				res.json({status:"OK", tag: req.params.tag, vals:rows});
 			}
 		})
 	});
@@ -154,7 +154,7 @@ exports.allTags = function(req, res){
 	var db = new sqlite3.Database(dbFile);
 
 	db.serialize(function(){
-		var query = "SELECT * FROM TagData.tags WHERE deleted = 0";
+		var query = "SELECT * FROM tags WHERE deleted = 0";
 		var prepQuery = db.prepare(query);
 		prepQuery.all(function(err, rows) {
 			prepQuery.finalize();
@@ -169,6 +169,6 @@ exports.allTags = function(req, res){
 	});
 };
 
-exports.allValues = function(req, res){
+exports.allvals = function(req, res){
 	res.json({status: "error", message: "not implemented"});
 };