Technically, he was General Bonaparte until becoming First Consul. Then he was known as Bonaparte. After his elevation to the imperial dignity as Emperor of the French (not of France), he would be, or should be, known as Napoleon.
I do hope this helps.