Clean up on naming
Small tweak