Rename code to avoid conficts