more core renaming, fixed NPE in gambling bot