Trying to finally fix the registerBug
Minor Renamings