Fixed minor bug with Module naming
Fixed minor bugs with table name not being correct