remove hardcoded name
commet database dependent code