Rename core tables too

Change-Id: I1b9fa6bc7d4277fc629180cf233d59a53abb5472