Fixing bugs and renaming.