Cleaned up naming convention!