Uncommited changes of "Added naming support for @Mock annotations"