Fix name collision, clenaups