Some name fixing and ao commit