More more into default config

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
Centralise table names

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
More renames

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>