Updated accordingly to Daniel table naming conentions