Normalize plugin naming and fix bug